Remove size_request from GtkHandleBox

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 3cb84b207979e0adff2aafa894824d2fe00ce9ab..1e02e84f87a7f93e6df6da9b282bac31ca7d6dd7 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -140,6 +140,12 @@ static void     gtk_handle_box_style_set     (GtkWidget      *widget,
                                               GtkStyle       *previous_style);
 static void     gtk_handle_box_size_request  (GtkWidget      *widget,
                                               GtkRequisition *requisition);
+static void     gtk_handle_box_get_preferred_width (GtkWidget *widget,
+                                                   gint      *minimum,
+                                                   gint      *natural);
+static void     gtk_handle_box_get_preferred_height (GtkWidget *widget,
+                                                   gint      *minimum,
+                                                   gint      *natural);
 static void     gtk_handle_box_size_allocate (GtkWidget      *widget,
                                               GtkAllocation  *real_allocation);
 static void     gtk_handle_box_add           (GtkContainer   *container,
@@ -224,7 +230,8 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
   widget_class->realize = gtk_handle_box_realize;
   widget_class->unrealize = gtk_handle_box_unrealize;
   widget_class->style_set = gtk_handle_box_style_set;
-  widget_class->size_request = gtk_handle_box_size_request;
+  widget_class->get_preferred_width = gtk_handle_box_get_preferred_width;
+  widget_class->get_preferred_height = gtk_handle_box_get_preferred_height;
   widget_class->size_allocate = gtk_handle_box_size_allocate;
   widget_class->draw = gtk_handle_box_draw;
   widget_class->button_press_event = gtk_handle_box_button_press;
@@ -623,6 +630,31 @@ gtk_handle_box_size_request (GtkWidget      *widget,
     }
 }
 
+static void
+gtk_handle_box_get_preferred_width (GtkWidget *widget,
+                                    gint      *minimum,
+                                    gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_handle_box_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_handle_box_get_preferred_height (GtkWidget *widget,
+                                    gint      *minimum,
+                                    gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_handle_box_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.height;
+}
+
+
 static void
 gtk_handle_box_size_allocate (GtkWidget     *widget,
                              GtkAllocation *allocation)